dgit.raspbian.org Git - xen.git/commit

projects / xen.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3456cf6 ddc87ed)

author	iap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
	Fri, 2 Apr 2004 14:03:03 +0000 (14:03 +0000)
committer	iap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
	Fri, 2 Apr 2004 14:03:03 +0000 (14:03 +0000)
commit	72ab8c7adebff63d3a4b6ac540cf0ea842442b6a
tree	6f039ba3585a5234800ecf968ad978f4f635fad4	tree \| snapshot
parent	3456cf6f1b5be8d96439fcf79cbb323b2f2ac914	commit \| diff
parent	ddc87ed30206661209945c82d32b799e0fcbf6fe	commit \| diff

bitkeeper revision 1.834 (406d7297L8YEnoDy3p-Js-U7j2roug)

manual merge as two conflicting dom0 ops

tools/xc/py/Xc.c	diff1 \|	diff2 \|	blob \| history
xen/common/dom0_ops.c	diff1 \|	diff2 \|	blob \| history
xen/common/domain.c	diff1 \|	diff2 \|	blob \| history
xen/common/memory.c	diff1 \|	diff2 \|	blob \| history
xen/common/sched_bvt.c	diff1 \|	diff2 \|	blob \| history
xen/common/sched_rrobin.c	diff1 \|	diff2 \|	blob \| history
xen/common/schedule.c	diff1 \|	diff2 \|	blob \| history
xen/include/hypervisor-ifs/dom0_ops.h	diff1 \|	diff2 \|	blob \| history
xen/include/xen/mm.h	diff1 \|	diff2 \|	blob \| history
xen/include/xen/sched-if.h	diff1 \|	diff2 \|	blob \| history
xen/include/xen/sched.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.